From da4c723a37eaba9c34db4b45622584e0733378a7 Mon Sep 17 00:00:00 2001 From: tsteven4 <13596209+tsteven4@users.noreply.github.com> Date: Tue, 25 Aug 2020 14:48:21 -0600 Subject: [PATCH] remove unintentional collision with errno. (#636) this caused compiler failures with gnu++1z. --- gbfile.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gbfile.cc b/gbfile.cc index 0884798c4..a4bbfec31 100644 --- a/gbfile.cc +++ b/gbfile.cc @@ -26,7 +26,6 @@ #include // for assert #include // for tolower -#include // for errno #include // for va_list, va_end, va_copy, va_start #include // for EOF, ferror, ftell, SEEK_SET, SEEK_CUR, SEEK_END, clearerr, fclose, feof, fflush, fileno, fread, fseek, fwrite, ungetc, vsnprintf, FILE, stdin, stdout #include // for memcpy, strlen, strchr, strcpy, strncat @@ -306,12 +305,12 @@ stdapi_seek(gbfile* self, int32_t offset, int whence) static gbsize_t stdapi_read(void* buf, const gbsize_t size, const gbsize_t members, gbfile* self) { - int errno; + int error_number; gbsize_t result = fread(buf, size, members, self->handle.std); - if ((result < members) && (errno = ferror(self->handle.std))) { + if ((result < members) && (error_number = ferror(self->handle.std))) { fatal("%s: Error %d occurred during read of file '%s'!\n", - self->module, errno, self->name); + self->module, error_number, self->name); } return result; } -- 2.30.2